(mouse-choose-completion): Check for next-single-property-change

returning nil.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 21264adf6ad92b8577cc9a1bf533aa1386f0be9f..1e9b664c36edcfbab8d4d17494bec934828fd13c 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1204,7 +1204,8 @@ and selects that window."
          (if (null beg)
              (error "No completion here"))
          (setq beg (previous-single-property-change beg 'mouse-face))
-         (setq end (next-single-property-change end 'mouse-face))
+         (setq end (or (next-single-property-change end 'mouse-face)
+                       (point-max)))
          (setq choice (buffer-substring beg end)))))
     (let ((owindow (selected-window)))
       (select-window (posn-window (event-start event)))